build: Install libraries in an `arch` sub-folder #889

Steelskin · 2025-07-23T16:55:33Z

This is the proper installation scheme for Swift libraries and prevents having to manually copy them in build.ps1.

This is the proper installation scheme for Swift libraries and prevents having to manually copy them in `build.ps1`.

Steelskin · 2025-07-23T16:55:47Z

@swift-ci please smoke test

compnerd

If we are updating this, we should be using the new tooling that we have been adding into the runtimes build. There is already a pending change of mine that needs to be refreshed for this.

Steelskin · 2025-08-04T18:58:35Z

If we are updating this, we should be using the new tooling that we have been adding into the runtimes build. There is already a pending change of mine that needs to be refreshed for this.

I changed this to get the arch value from the compiler. Is this what you had in mind?

cmake/modules/SwiftSupport.cmake

This also refactors the code so we only do a single call to the Swift compiler to gather the target info JSON.

Steelskin · 2025-08-05T20:21:48Z

@swift-ci please smoke test

Steelskin · 2025-08-05T21:42:03Z

@swift-ci please test

compnerd · 2025-08-06T16:20:36Z

@swift-ci please test Windows platform

compnerd · 2025-08-06T16:21:10Z

@swift-ci please test Linux platform

cmake/modules/SwiftSupport.cmake

Steelskin · 2025-08-06T16:58:53Z

@swift-ci please test windows platform

Steelskin · 2025-08-06T16:59:02Z

@swift-ci please test linux platform

Steelskin · 2025-08-06T17:05:25Z

@swift-ci please test Windows platform

Steelskin · 2025-08-06T21:14:32Z

@swift-ci please test linux platform

Steelskin · 2025-08-06T21:14:40Z

@swift-ci please test Windows platform

Steelskin · 2025-08-06T23:16:00Z

@swift-ci please test Linux platform

Steelskin · 2025-08-07T17:05:35Z

@swift-ci please test

compnerd · 2025-08-11T18:00:13Z

I think that we should do a cross-repo test and ensure that we can build the windows toolchain, Linux toolchain, and that they both function after this change.

Steelskin · 2025-08-12T15:59:50Z

I think that we should do a cross-repo test and ensure that we can build the windows toolchain, Linux toolchain, and that they both function after this change.

I started a test build with the changes here: swiftlang/swift#83666

Steelskin · 2025-08-19T19:06:26Z

I tested the resulting installer on Windows and our internal projects built successfully with it. Can we land this or is there anything else I should test here?

compnerd · 2025-08-19T21:19:51Z

Yes, please also validate that the Linux toolchain still works properly.

Steelskin · 2025-08-20T16:42:11Z

Yes, please also validate that the Linux toolchain still works properly.

Thank you for the pointers for installing the built artifact. Here is a test project I used:

$ ~/usr/bin/swift build
Fetching https://github.com/apple/swift-collections.git
Fetched https://github.com/apple/swift-collections.git from cache (1.10s)
Computing version for https://github.com/apple/swift-collections.git
Computed https://github.com/apple/swift-collections.git at 1.0.6 (1.33s)
Creating working copy for https://github.com/apple/swift-collections.git
Working copy of https://github.com/apple/swift-collections.git resolved at 1.0.6
Building for debugging...
/home/steelo/src/cassowary/Sources/Cassowary/Expression.swift:5:1: warning: using '@_implementationOnly' without enabling library evolution for 'Cassowary' may lead to instability during execution [#ImplementationOnlyDeprecated]
 3 |
 4 | @_implementationOnly
 5 | import OrderedCollections
   | `- warning: using '@_implementationOnly' without enabling library evolution for 'Cassowary' may lead to instability during execution [#ImplementationOnlyDeprecated]
 6 |
 7 | /// An expression is a linear combination of terms and a constant.

/home/steelo/src/cassowary/Sources/Cassowary/Row.swift:5:1: warning: using '@_implementationOnly' without enabling library evolution for 'Cassowary' may lead to instability during execution [#ImplementationOnlyDeprecated]
  3 |
  4 | @_implementationOnly
  5 | import OrderedCollections
    | `- warning: using '@_implementationOnly' without enabling library evolution for 'Cassowary' may lead to instability during execution [#ImplementationOnlyDeprecated]
  6 |
  7 | internal final class Row {

[#ImplementationOnlyDeprecated]: <https://docs.swift.org/compiler/documentation/diagnostics/implementation-only-deprecated>
/home/steelo/src/cassowary/Sources/Cassowary/Row.swift:5:1: warning: using '@_implementationOnly' without enabling library evolution for 'Cassowary' may lead to instability during execution [#ImplementationOnlyDeprecated]
  3 |
  4 | @_implementationOnly
  5 | import OrderedCollections
    | `- warning: using '@_implementationOnly' without enabling library evolution for 'Cassowary' may lead to instability during execution [#ImplementationOnlyDeprecated]
  6 |
  7 | internal final class Row {

[#ImplementationOnlyDeprecated]: <https://docs.swift.org/compiler/documentation/diagnostics/implementation-only-deprecated>
/home/steelo/src/cassowary/Sources/Cassowary/Expression.swift:5:1: warning: using '@_implementationOnly' without enabling library evolution for 'Cassowary' may lead to instability during execution [#ImplementationOnlyDeprecated]
 3 |
 4 | @_implementationOnly
 5 | import OrderedCollections
   | `- warning: using '@_implementationOnly' without enabling library evolution for 'Cassowary' may lead to instability during execution [#ImplementationOnlyDeprecated]
 6 |
 7 | /// An expression is a linear combination of terms and a constant.

[#ImplementationOnlyDeprecated]: <https://docs.swift.org/compiler/documentation/diagnostics/implementation-only-deprecated>
[69/69] Compiling Cassowary Expression.swift
Build complete! (5.50s)

$ ~/usr/bin/swift test
[1/1] Planning build
Building for debugging...
/home/steelo/src/cassowary/Tests/CassowaryTests/CassowaryTests.swift:231:16: warning: 'add(constraint:_:)' is deprecated: renamed add(constraint:strength:) [#DeprecatedDeclaration]
229 |
230 |     try solver.add(variable: c, strength: .strong)
231 |     try solver.add(constraint: a >= 0, .strong)
    |                `- warning: 'add(constraint:_:)' is deprecated: renamed add(constraint:strength:) [#DeprecatedDeclaration]
232 |     try solver.add(constraint: b >= a, .strong)
233 |     try solver.add(constraint: b - a == c, .required)

/home/steelo/src/cassowary/Tests/CassowaryTests/CassowaryTests.swift:232:16: warning: 'add(constraint:_:)' is deprecated: renamed add(constraint:strength:) [#DeprecatedDeclaration]
230 |     try solver.add(variable: c, strength: .strong)
231 |     try solver.add(constraint: a >= 0, .strong)
232 |     try solver.add(constraint: b >= a, .strong)
    |                `- warning: 'add(constraint:_:)' is deprecated: renamed add(constraint:strength:) [#DeprecatedDeclaration]
233 |     try solver.add(constraint: b - a == c, .required)
234 |     try solver.suggest(value: 100, for: c)

/home/steelo/src/cassowary/Tests/CassowaryTests/CassowaryTests.swift:233:16: warning: 'add(constraint:_:)' is deprecated: renamed add(constraint:strength:) [#DeprecatedDeclaration]
231 |     try solver.add(constraint: a >= 0, .strong)
232 |     try solver.add(constraint: b >= a, .strong)
233 |     try solver.add(constraint: b - a == c, .required)
    |                `- warning: 'add(constraint:_:)' is deprecated: renamed add(constraint:strength:) [#DeprecatedDeclaration]
234 |     try solver.suggest(value: 100, for: c)
235 |

[#DeprecatedDeclaration]: <https://docs.swift.org/compiler/documentation/diagnostics/deprecated-declaration>
[23/23] Linking cassowaryPackageTests.xctest
Build complete! (4.67s)
Test Suite 'All tests' started at 2025-08-20 09:41:19.437
Test Suite 'debug.xctest' started at 2025-08-20 09:41:19.450
Test Suite 'CassowaryTests' started at 2025-08-20 09:41:19.450
Test Case 'CassowaryTests.testComplex1' started at 2025-08-20 09:41:19.450
Test Case 'CassowaryTests.testComplex1' passed (0.001 seconds)
Test Case 'CassowaryTests.testComplex2' started at 2025-08-20 09:41:19.451
Test Case 'CassowaryTests.testComplex2' passed (0.0 seconds)
Test Case 'CassowaryTests.testHandlingInfeasibleConstraints' started at 2025-08-20 09:41:19.451
Test Case 'CassowaryTests.testHandlingInfeasibleConstraints' passed (0.0 seconds)
Test Case 'CassowaryTests.testMultiTermExpressionOrder' started at 2025-08-20 09:41:19.452
Test Case 'CassowaryTests.testMultiTermExpressionOrder' passed (0.0 seconds)
Test Case 'CassowaryTests.testSimple1' started at 2025-08-20 09:41:19.452
Test Case 'CassowaryTests.testSimple1' passed (0.0 seconds)
Test Case 'CassowaryTests.testSimple2' started at 2025-08-20 09:41:19.452
Test Case 'CassowaryTests.testSimple2' passed (0.0 seconds)
Test Case 'CassowaryTests.testSimple3' started at 2025-08-20 09:41:19.452
Test Case 'CassowaryTests.testSimple3' passed (0.0 seconds)
Test Case 'CassowaryTests.testUnderConstrainedSystem' started at 2025-08-20 09:41:19.453
Test Case 'CassowaryTests.testUnderConstrainedSystem' passed (0.106 seconds)
Test Case 'CassowaryTests.testWithStrength' started at 2025-08-20 09:41:19.559
Test Case 'CassowaryTests.testWithStrength' passed (0.002 seconds)
Test Case 'CassowaryTests.testWithStrength2' started at 2025-08-20 09:41:19.561
Test Case 'CassowaryTests.testWithStrength2' passed (0.002 seconds)
Test Suite 'CassowaryTests' passed at 2025-08-20 09:41:19.562
         Executed 10 tests, with 0 failures (0 unexpected) in 0.113 (0.113) seconds
Test Suite 'debug.xctest' passed at 2025-08-20 09:41:19.562
         Executed 10 tests, with 0 failures (0 unexpected) in 0.113 (0.113) seconds
Test Suite 'All tests' passed at 2025-08-20 09:41:19.563
         Executed 10 tests, with 0 failures (0 unexpected) in 0.113 (0.113) seconds
◇ Test run started.
↳ Testing Library Version: 6.3-dev (a68a681c8adcd35)
↳ Target Platform: x86_64-unknown-linux-gnu
✔ Test run with 0 tests in 0 suites passed after 0.001 seconds.

build: Install libraries in an arch sub-folder

e73dc2b

This is the proper installation scheme for Swift libraries and prevents having to manually copy them in `build.ps1`.

rokhinip requested review from akmorrison, compnerd and al45tair July 23, 2025 16:58

compnerd requested changes Jul 23, 2025

View reviewed changes

Use the arch value from the compiler

5301c96

Steelskin requested a review from compnerd August 4, 2025 18:57

compnerd reviewed Aug 5, 2025

View reviewed changes

cmake/modules/SwiftSupport.cmake Outdated Show resolved Hide resolved

Get the platform name from the compiler

3eff559

This also refactors the code so we only do a single call to the Swift compiler to gather the target info JSON.

Steelskin requested a review from compnerd August 5, 2025 18:38

Use the right variable name

a0def02

compnerd reviewed Aug 6, 2025

View reviewed changes

cmake/modules/SwiftSupport.cmake Outdated Show resolved Hide resolved

Rename dispatch_Swift_* to dispatch_*

f51e481

Steelskin requested review from compnerd and etcwilde August 6, 2025 16:59

Add option to install into an arch-subdir

0fcef7d

compnerd approved these changes Aug 11, 2025

View reviewed changes

Steelskin mentioned this pull request Aug 12, 2025

build: Install dispatch libraries in arch subdir swiftlang/swift#83666

Merged

compnerd merged commit a6f0512 into swiftlang:main Aug 20, 2025
2 checks passed

Steelskin deleted the fabrice/package-swift-libs-arch-folder branch August 20, 2025 16:53

build: Install libraries in an arch sub-folder #889

build: Install libraries in an arch sub-folder #889

Uh oh!

Conversation

Steelskin commented Jul 23, 2025

Uh oh!

Steelskin commented Jul 23, 2025

Uh oh!

compnerd left a comment

Choose a reason for hiding this comment

Uh oh!

Steelskin commented Aug 4, 2025

Uh oh!

Uh oh!

Steelskin commented Aug 5, 2025

Uh oh!

Steelskin commented Aug 5, 2025

Uh oh!

compnerd commented Aug 6, 2025

Uh oh!

compnerd commented Aug 6, 2025

Uh oh!

Uh oh!

Steelskin commented Aug 6, 2025

Uh oh!

Steelskin commented Aug 6, 2025

Uh oh!

Steelskin commented Aug 6, 2025

Uh oh!

Steelskin commented Aug 6, 2025

Uh oh!

Steelskin commented Aug 6, 2025

Uh oh!

Steelskin commented Aug 6, 2025

Uh oh!

Steelskin commented Aug 7, 2025

Uh oh!

compnerd commented Aug 11, 2025

Uh oh!

Steelskin commented Aug 12, 2025

Uh oh!

Steelskin commented Aug 19, 2025

Uh oh!

compnerd commented Aug 19, 2025

Uh oh!

Steelskin commented Aug 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

build: Install libraries in an `arch` sub-folder #889

build: Install libraries in an `arch` sub-folder #889

Steelskin commented Aug 20, 2025 •

edited

Loading